tools/hotplug/Linux: fix completely wrong attempts to stop xenwatchdogd

"xen-watchdog stop" attempts to kill non existing "watchdogd" but
misses the running "xenwatchdogd".  This also provokes errors during
install and Debian package management.

Signed-off-by: user virtual <virtualusr@gmail.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/hotplug/Linux/init.d/xen-watchdog b/tools/hotplug/Linux/init.d/xen-watchdog
index 620e8415d0d41e66b491b602ffa1a88dc6ad6cbc..a5b3f6b96157abcecacf83eaa17df0b03d5b445c 100644 (file)
--- a/tools/hotplug/Linux/init.d/xen-watchdog
+++ b/tools/hotplug/Linux/init.d/xen-watchdog
@@ -17,6 +17,9 @@
 ### END INIT INFO
 #
 
+DAEMON=/usr/sbin/xenwatchdogd
+base=$(basename $DAEMON)
+
 # Source function library.
 if [ -e  /etc/init.d/functions ] ; then
     . /etc/init.d/functions
@@ -39,10 +42,9 @@ fi
 
 start() {
        local r
-       base="watchdogd"
        echo -n $"Starting domain watchdog daemon: "
 
-       /usr/sbin/xenwatchdogd 30 15
+       $DAEMON 30 15
        r=$?
        [ "$r" -eq 0 ] && success $"$base startup" || failure $"$base startup"
        echo
@@ -52,10 +54,9 @@ start() {
 
 stop() {
        local r
-       base="watchdogd"
        echo -n $"Stopping domain watchdog daemon: "
 
-       killall -USR1 watchdogd 2>/dev/null
+       killall -USR1 $base 2>/dev/null
        r=$?
        [ "$r" -eq 0 ] && success $"$base stop" || failure $"$base stop"
        echo